GtkWidget: Propagate scale to GtkStyleContext
authorAlexander Larsson <alexl@redhat.com>
Thu, 27 Jun 2013 16:23:17 +0000 (18:23 +0200)
committerAlexander Larsson <alexl@redhat.com>
Wed, 3 Jul 2013 12:39:25 +0000 (14:39 +0200)
gtk/gtkwidget.c

index c1f9bb4dabaec4e79cc412b934af59911c65fbf3..b5844e869e7b651a742dbaeefc72bbaa4c83fb08 100644 (file)
@@ -4999,6 +4999,8 @@ gtk_widget_realize (GtkWidget *widget)
       _gtk_widget_enable_device_events (widget);
       gtk_widget_update_devices_mask (widget, TRUE);
 
+      if (priv->context)
+       gtk_style_context_set_scale (priv->context, gtk_widget_get_scale_factor (widget));
       gtk_widget_connect_frame_clock (widget,
                                       gtk_widget_get_frame_clock (widget));
 
@@ -15383,6 +15385,7 @@ gtk_widget_get_style_context (GtkWidget *widget)
       priv->context = gtk_style_context_new ();
 
       gtk_style_context_set_state (priv->context, priv->state_flags);
+      gtk_style_context_set_scale (priv->context, gtk_widget_get_scale_factor (widget));
 
       screen = gtk_widget_get_screen (widget);
       if (screen)